Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <[email protected]>
Thu, 16 Jan 2014 18:50:16 +0000 (13:50 -0500)
committerTom Rini <[email protected]>
Thu, 16 Jan 2014 18:50:16 +0000 (13:50 -0500)

Trivial merge